Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master #107

Merged
merged 14 commits into from
Dec 4, 2017
Merged

Merge master #107

merged 14 commits into from
Dec 4, 2017

Conversation

blueyed
Copy link

@blueyed blueyed commented Dec 4, 2017

No description provided.

blueyed and others added 14 commits November 16, 2017 15:35
The `stripe_id` for plans is not unique by itself globally (it is not generated
by Stripe), and therefore needs to be unique per account.
Add UniquePerAccountStripeObject for Plans
…horizeWebhook-validate-without-account

Fix AccountApplicationDeauthorizeWebhook for non-account events
AdminTestCase: use setUpClass for fixtures
Conflicts:
	pinax/stripe/migrations/0011_rename_account_transfers_payout.py
	pinax/stripe/migrations/0013_charge_outcome.py
	pinax/stripe/tests/test_webhooks.py
	pinax/stripe/webhooks.py
@codecov
Copy link

codecov bot commented Dec 4, 2017

Codecov Report

Merging #107 into next will decrease coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             next     #107      +/-   ##
==========================================
- Coverage   98.97%   98.96%   -0.01%     
==========================================
  Files          34       33       -1     
  Lines        1942     1940       -2     
  Branches      173      173              
==========================================
- Hits         1922     1920       -2     
  Misses         12       12              
  Partials        8        8
Flag Coverage Δ
#py27dj111 98.96% <ø> (-0.01%) ⬇️
#py36dj20psql 98.96% <ø> (-0.01%) ⬇️
Impacted Files Coverage Δ
pinax/stripe/management/commands/__init__.py

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cd002cb...3158330. Read the comment docs.

@blueyed blueyed merged commit ffee579 into lock8:next Dec 4, 2017
@blueyed blueyed deleted the merge-master branch December 4, 2017 15:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants